[IA64] add volatile to mpt_table

mpt_table is accessed concurrently by cpus, so it needs volatile qualifier

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

diff --git a/xen/arch/ia64/xen/xenmem.c b/xen/arch/ia64/xen/xenmem.c
index ebdba3b19c8005e971f8a9a0576d2d17a023bc5c..49b6c5558889a4b676128b08a3b9cfea8a1f11b2 100644 (file)
--- a/xen/arch/ia64/xen/xenmem.c
+++ b/xen/arch/ia64/xen/xenmem.c
@@ -35,7 +35,7 @@ unsigned long max_page;
 /*
  * Set up the page tables.
  */
-unsigned long *mpt_table;
+volatile unsigned long *mpt_table;
 
 void
 paging_init (void)
@@ -139,18 +139,18 @@ create_frametable_page_table (u64 start, u64 end, void *arg)
 static int
 create_mpttable_page_table (u64 start, u64 end, void *arg)
 {
+       unsigned long map_start, map_end;
        unsigned long address, start_page, end_page;
-       unsigned long *map_start, *map_end;
        pgd_t *pgd;
        pud_t *pud;
        pmd_t *pmd;
        pte_t *pte;
 
-       map_start = mpt_table + (__pa(start) >> PAGE_SHIFT);
-       map_end   = mpt_table + (__pa(end) >> PAGE_SHIFT);
+       map_start = (unsigned long)(mpt_table + (__pa(start) >> PAGE_SHIFT));
+       map_end   = (unsigned long)(mpt_table + (__pa(end) >> PAGE_SHIFT));
 
-       start_page = (unsigned long) map_start & PAGE_MASK;
-       end_page = PAGE_ALIGN((unsigned long) map_end);
+       start_page = map_start & PAGE_MASK;
+       end_page = PAGE_ALIGN(map_end);
 
        for (address = start_page; address < end_page; address += PAGE_SIZE) {
                pgd = frametable_pgd_offset(address);

diff --git a/xen/include/asm-ia64/mm.h b/xen/include/asm-ia64/mm.h
index 37d77aded477548af8517e0bd5b76d1445cbaf5b..8f4be39099f15ef5d8c8ff763fdeb63abbad087b 100644 (file)
--- a/xen/include/asm-ia64/mm.h
+++ b/xen/include/asm-ia64/mm.h
@@ -443,7 +443,7 @@ extern unsigned long dom0vp_zap_physmap(struct domain *d, unsigned long gpfn, un
 extern unsigned long dom0vp_add_physmap(struct domain* d, unsigned long gpfn, unsigned long mfn, unsigned long flags, domid_t domid);
 #endif
 
-extern unsigned long *mpt_table;
+extern volatile unsigned long *mpt_table;
 extern unsigned long gmfn_to_mfn_foreign(struct domain *d, unsigned long gpfn);
 extern u64 translate_domain_pte(u64 pteval, u64 address, u64 itir__, u64* logps);
 #define machine_to_phys_mapping        mpt_table